Remove ostree-grub2 and the boot-related parts of ostree

This leaves behind the library and the command-line tool, which are
also used by Flatpak. When we have documentation for how to use and test
OSTree deployments with a Debian derivative (see #824649), they should
be reinstated in an ostree-boot package (see #824650).

diff --git a/debian/changelog b/debian/changelog
index 9ba51ce31915b13b799f363e42acdff3f78d2d6b..77186cd34dbeb1351405c6d5f446ed7dd96e7c4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 ostree (2016.5-3) UNRELEASED; urgency=medium
 
-  * Rename ostree-grub2 to ostree-boot. Move all initramfs and bootloader
-    integration there. (Closes: #824650)
+  * Remove ostree-grub2 and the boot-related parts of ostree, leaving
+    the library and the command-line tool, which are also used by
+    Flatpak.
+    When we have documentation for how to use and test OSTree
+    deployments with a Debian derivative (see #824649), they should be
+    reinstated in an ostree-boot package (see #824650).
 
  -- Simon McVittie <smcv@debian.org>  Wed, 08 Jun 2016 11:58:01 +0100
 

diff --git a/debian/control b/debian/control
index 33bd6aa43020ae3d71ffe164498fea1f804f16ec..3b4a657ee247ed8bab75355ffd5e2334ddbe3eeb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -127,39 +127,6 @@ Description: content-addressed filesystem for operating system binaries
  filesystem trees. It does not affect the boot process for the system
  on which it is installed.
 
-Package: ostree-boot
-Architecture: linux-any
-Depends:
- dracut,
- ostree (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
-Recommends:
- grub-efi-amd64 | grub-pc | extlinux | syslinux | u-boot,
-Breaks:
- ostree (<< ${binary:Version}),
- ostree-grub2 (<< ${binary:Version}),
-Replaces:
- ostree (<< ${binary:Version}),
- ostree-grub2 (<< ${binary:Version}),
-Provides:
- ostree-grub2 (= ${binary:Version}),
-Description: ostree boot loader and initramfs integration
- OSTree is a tool for managing bootable, immutable, versioned filesystem
- trees. See the ostree package's description for more details.
- .
- This package contains configuration snippets and executables needed to
- boot a Debian derivative using OSTree. This integration currently has some
- limitations:
- .
-  - the initramfs must have been made using dracut
-  - the root filesystem must be one that dracut can mount without a root=
-    command-line argument (an EFI partition with the GUID defined in
-    the Discoverable Partitions specification)
-  - /boot must be a separate partition
-  - the boot loader must be one that is supported by ostree, currently
-    GNU GRUB 2, syslinux/extlinux or Das U-Boot
-
 Package: ostree-tests
 Architecture: linux-any
 Depends:

diff --git a/debian/ostree-boot.control b/debian/ostree-boot.control
new file mode 100644 (file)
index 0000000..ac76885
--- /dev/null
+++ b/debian/ostree-boot.control
@@ -0,0 +1,32 @@
+Package: ostree-boot
+Architecture: linux-any
+Depends:
+ dracut,
+ ostree (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ grub-efi-amd64 | grub-pc | extlinux | syslinux | u-boot,
+Breaks:
+ ostree (<< ${binary:Version}),
+ ostree-grub2 (<< ${binary:Version}),
+Replaces:
+ ostree (<< ${binary:Version}),
+ ostree-grub2 (<< ${binary:Version}),
+Provides:
+ ostree-grub2 (= ${binary:Version}),
+Description: ostree boot loader and initramfs integration
+ OSTree is a tool for managing bootable, immutable, versioned filesystem
+ trees. See the ostree package's description for more details.
+ .
+ This package contains configuration snippets and executables needed to
+ boot a Debian derivative using OSTree. This integration currently has some
+ limitations:
+ .
+  - the initramfs must have been made using dracut
+  - the root filesystem must be one that dracut can mount without a root=
+    command-line argument (an EFI partition with the GUID defined in
+    the Discoverable Partitions specification)
+  - /boot must be a separate partition
+  - the boot loader must be one that is supported by ostree, currently
+    GNU GRUB 2, syslinux/extlinux or Das U-Boot

diff --git a/debian/rules b/debian/rules
index 1141b41ae33d2698cec84fbed802e0c8d7653b7b..2c6fae104f32f61ab4b4bb94bf48df0ab9cbeb8b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,19 @@ override_dh_auto_install:
 override_dh_install:
        rm -f debian/tmp/usr/lib/*/*.la
        rm -f debian/tmp/usr/lib/installed-tests/ostree/*.la
+       :
+       # FIXME: when someone documents how to test these (#824649) they
+       # should be installed in a new ostree-boot package: see
+       # debian/ostree-boot.* and https://bugs.debian.org/824650
+       rm -f debian/tmp/etc/dracut.conf.d/ostree.conf
+       rm -f debian/tmp/etc/grub.d/15_ostree
+       rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
+       rm -f debian/tmp/lib/systemd/system/ostree-remount.service
+       rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/
+       rm -f debian/tmp/usr/lib/ostree/grub2-15_ostree
+       rm -f debian/tmp/usr/sbin/ostree-prepare-root
+       rm -f debian/tmp/usr/sbin/ostree-remount
+       :
        dh_install --fail-missing
 
 override_dh_makeshlibs: